Merge conflicts solutioned

[RRRRHHHH_Code] / ruralHouses client / .classpath

diff --git a/ruralHouses client/.classpath b/ruralHouses client/.classpath
new file mode 100644 (file)
index 0000000..40ed315
--- /dev/null
+++ b/ruralHouses client/.classpath
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="src" path="src" />
+       <classpathentry kind="con"
+               path="org.eclipse.jdt.launching.JRE_CONTAINER" />
+       <classpathentry kind="lib" path="lib/additionalLibs/jcalendar.jar" />
+       <classpathentry kind="lib"
+               path="lib/db4o/lib/db4o-8.0.249.16098-all-java5.jar" />
+       <classpathentry kind="output" path="bin" />
+</classpath>